auto upstream

author Joakim Verona <joakim@verona.se>

Tue, 9 Apr 2013 06:30:40 +0000 (08:30 +0200)

committer Joakim Verona <joakim@verona.se>

Tue, 9 Apr 2013 06:30:40 +0000 (08:30 +0200)
author Joakim Verona <joakim@verona.se>
Tue, 9 Apr 2013 06:30:40 +0000 (08:30 +0200)
committer Joakim Verona <joakim@verona.se>
Tue, 9 Apr 2013 06:30:40 +0000 (08:30 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/window.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Tue, 9 Apr 2013 06:30:40 +0000 (08:30 +0200)
committer	Joakim Verona <joakim@verona.se>
	Tue, 9 Apr 2013 06:30:40 +0000 (08:30 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/window.c	patch \|	diff1 \|	diff2 \|	blob \| history